widget: 3-way merge ate my g_object_ref()
authorCarlos Garnacho <carlosg@gnome.org>
Fri, 16 May 2014 16:58:11 +0000 (18:58 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 23 May 2014 17:54:32 +0000 (19:54 +0200)
Move it to the right place.

gtk/gtkwidget.c

index 9cb254d49122a532c08c2facf8cb69251a00df78..015184bf83c49d00b048740aea2b516241d4bc30 100644 (file)
@@ -7284,7 +7284,6 @@ _gtk_widget_get_controllers_evmask (GtkWidget *widget)
   GList *l;
 
   priv = widget->priv;
-  g_object_ref (widget);
 
   for (l = priv->event_controllers; l; l = l->next)
     {
@@ -7307,6 +7306,7 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
   GList *l;
 
   priv = widget->priv;
+  g_object_ref (widget);
 
   l = priv->event_controllers;
   while (l != NULL)